Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 7 Feb 2010 22:11:48 +0000 (22:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 7 Feb 2010 22:11:48 +0000 (22:11 +0000)

Trivial merge